Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 30 Nov 2011 17:59:17 +0000 (09:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 30 Nov 2011 17:59:17 +0000 (09:59 -0800)
commit966739bbc5fd4f54d652a103b6abe99f8915f600
tree8400b6d165622ffe77c836852fb29e6994999554
parenta9cec1eebe6db419257222fe43cdf36faf964cf6
parentcdc7bd2a89fd79e71b6a04735ddccb6a68117ca2
Merge from trunk.